Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Wed, 18 Dec 2013 20:06:43 +0000 (15:06 -0500)
committerTom Rini <[email protected]>
Wed, 18 Dec 2013 20:06:43 +0000 (15:06 -0500)

Trivial merge